Merge.

diff --cc tools/python/xen/util/process.py
index 07bc73b5053a693a51caf0e1e2d3ec4610a1d38d,07bc73b5053a693a51caf0e1e2d3ec4610a1d38d..9117ef4dedc86ca15defa2a2a0a55ea4b1e2fcd2
--- 1/tools/python/xen/util/process.py
--- 2/tools/python/xen/util/process.py
+++ b/tools/python/xen/util/process.py
@@@ -24,6 -24,6 +24,8 @@@ def runscript(cmd)
          r = p.poll()
          for (fd, event) in r:
              if event == select.POLLHUP:
++                cout.close()
++                cerr.close()
                  return stdout
              if fd == cout.fileno():
                  stdout = stdout + cout.readline()

diff --cc tools/python/xen/xend/image.py
index 697375d064f3917d1d090cc654da35796ff05caa,30b94cd13125c783c03030b62787a3b889c3947b..7702a7602c75ecdcafb356bc25c80e75017f7675
--- 1/tools/python/xen/xend/image.py
--- 2/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@@ -322,12 -334,12 +322,12 @@@ class VmxImageHandler(ImageHandler)
          
      # Return a list of cmd line args to the device models based on the
      # xm config file
 -    def parseDeviceModelArgs(self, config):
 +    def parseDeviceModelArgs(self, imageConfig, deviceConfig):
          dmargs = [ 'cdrom', 'boot', 'fda', 'fdb',
-                    'localtime', 'serial', 'stdvga', 'isa' ] 
+                    'localtime', 'serial', 'stdvga', 'isa', 'vcpus' ] 
          ret = []
          for a in dmargs:
 -            v = sxp.child_value(config, a)
 +            v = sxp.child_value(imageConfig, a)
  
              # python doesn't allow '-' in variable names
              if a == 'stdvga': a = 'std-vga'